Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 8 Apr 2012 07:00:32 +0000 (00:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 8 Apr 2012 07:00:32 +0000 (00:00 -0700)
commit06cdf272580d89a7cfe3692dbc2ac64d3bfb7e33
tree1c7d0244fd387680e9d7a4165a912b2ac8d747b3
parent4b1bbae91ecd6e5d90bdb763f684df123df6ecb6
parentb0c1808ac9bf8d9615fedf6bef4a567e4d0171d9
Merge from trunk.